Merge from mainline.
authorKatsumi Yamaoka <katsumi@flagship2>
Fri, 16 Jul 2010 12:36:52 +0000 (12:36 +0000)
committerKatsumi Yamaoka <katsumi@flagship2>
Fri, 16 Jul 2010 12:36:52 +0000 (12:36 +0000)
commitb333c220f2b1e40bfa3bc5d92bba829b203acbd1
treeb0e365f1ec410a29c89f7fa444727b346e64ff08
parent7a4582eac40719d82af156521e3999af409f3733
parentc7b419c2e257f130fd98f02d48c81469957be1ee
Merge from mainline.